bitkeeper revision 1.1236.40.1 (42403ff1ZGMKPWPwodeJzyyFrCMVvg)
authorjrb44@swoop.cl.cam.ac.uk <jrb44@swoop.cl.cam.ac.uk>
Tue, 22 Mar 2005 15:55:29 +0000 (15:55 +0000)
committerjrb44@swoop.cl.cam.ac.uk <jrb44@swoop.cl.cam.ac.uk>
Tue, 22 Mar 2005 15:55:29 +0000 (15:55 +0000)
commitdba3ede51ea04b936457ea239147b4767d1fa6ac
tree660849a1761e4618c0f2af050a701aee342920c1
parentfc943b13db93c5153e82dd8131ace0d0ebfc6779
parent34b11086b69cf8293727bc0c10fca4c28bafdf71
bitkeeper revision 1.1236.40.1 (42403ff1ZGMKPWPwodeJzyyFrCMVvg)

manual merge phase 1 of 2 :-(
tools/blktap/blockstore.h